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