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