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