[automerger skipped] Merge "[Provider Model] Cherry-pick from master...

[automerger skipped] Merge "[Provider Model] Cherry-pick from master ag/15008434, ag/15023697 and ag/15023698" into sc-v2-dev-plus-aosp am: 83708ef4 -s ours

am skip reason: Merged-In Ib127ad43831ada06fa6a07802b3648b30faac5b0 with SHA-1 5dbe2af7 is already in history

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

Change-Id: I75cc25a4c477f5a11037f77ee3eefdbe1ca08847