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