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