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