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