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