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