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