[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am:...

[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e157157 -s ours am: bca22393 -s ours

am skip reason: Merged-In I40eb02d73faa4c2476d2a4e136e08c6dcd7795a2 with SHA-1 923cd9e7 is already in history

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

Change-Id: Iaf2604e6608392878d8c066f00c07eb388370767