Merge "Add support for SELF_SCAN_ONLY providers" into udc-dev am: dd18aad7 am: 413c8308

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



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