Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093 Change-Id: I3b0053910613af42ecc91b8a416b131c662c1837 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>