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