[automerger skipped] Merge "RESTRICT AUTOMERGE Fix READ/WRITE operation access...

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix READ/WRITE operation access issues on Restricted appOps." into tm-dev am: aab9efd9 am: f8c22285 am: c258f27b -s ours am: 8e5af383 -s ours am: 36741ffa -s ours

am skip reason: contains skip directive

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



Change-Id: I15a073fe5fccd0b2355703f5b6f3312154042f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>