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