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