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