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