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