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