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