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