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