[automerger skipped] [Provider Model] Cherry-pick from ag/15243691, ag/15287619, ag/15287620 and ag/15270751 am: 903f54b1 am: 0313f9c6 -s ours

am skip reason: Merged-In I4ea7aa443659cef091f525e0064a7db4c95522e2 with SHA-1 c3abe499 is already in history

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

Change-Id: I670ca8c041554ebcfa4a037fc89a95b550a71366