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