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