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