[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 am: 9d9d325e -s ours

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

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

Change-Id: I7ce0f82968f7de2ff6f0a6040827bb149bfc4200