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