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