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