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