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