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