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

am skip reason: subject contains skip directive

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

Change-Id: I0f55e90da9facac800bebb65260a8cb1ae215cce