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