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