[automerger skipped] [RESTRICT AUTOMERGE][Provider Model] Cherry-pick from...

[automerger skipped] [RESTRICT AUTOMERGE][Provider Model] Cherry-pick from ag/15243691, ag/15287619, ag/15287620 and ag/15270751 am: c3abe499 -s ours

am skip reason: skipped by user zoeychen

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

Change-Id: Icc8e632098ad22d1881766ec2d809896d1028798