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