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