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