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