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