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