[automerger skipped] RESTRICT AUTOMERGE Read flag resource overrides. am: 6e1571579e -s ours
am skip reason: Merged-In I40eb02d73faa4c2476d2a4e136e08c6dcd7795a2 with SHA-1 923cd9e73e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061635
Change-Id: Ida8b4dbae4970b991f02a69d0dc5ceb69291c56c
This commit is contained in: