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