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

[automerger skipped] Merge "Add support for SELF_SCAN_ONLY providers" into udc-dev am: dd18aad7 am: 8e5fb2c5 -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: Ife3917b36b95460afd4fbb1cf60e47851fb08c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>