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