Merge "[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides....

Merge "[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e157157 -s ours" am: feed8c99 -s ours am: ca1c4e50 -s ours am: e40726fd -s ours am: 11eae48a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1c75a29a44027d56b565f51e04c79af0799ba883