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