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