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