[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: 915c3f5b -s ours

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

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



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