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