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