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