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