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