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