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