[automerger skipped] [Provider Model] Cherry-pick from master ag/15008434,...

[automerger skipped] [Provider Model] Cherry-pick from master ag/15008434, ag/15023697 and ag/15023698 am: 5dbe2af7 am: 46de3e6b -s ours

am skip reason: skipped by user zoeychen

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

Change-Id: I780cf5b24584689e895d58b8c85e5669f58bf8bc