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