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