[automerger skipped] Merge "Merge "Add support for SELF_SCAN_ONLY providers"...

[automerger skipped] Merge "Merge "Add support for SELF_SCAN_ONLY providers" into udc-dev am: dd18aad7" into udc-mainline-prod am: ae0eb778 -s ours

am skip reason: Merged-In If24d505e889f933a9b4512b3aa5be0a2c91dc1ee with SHA-1 1106db1b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23215079



Change-Id: If54d1c05514a2eb8ed60680956b7449b9fe05b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>