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