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