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