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