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