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