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