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