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