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 skip reason: Merged-In I40eb02d73faa4c2476d2a4e136e08c6dcd7795a2 with SHA-1 e392af28 is already in history

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

Change-Id: I34adf2fd5f8537ec667566eb6a10c62241673eb7