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