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

[automerger skipped] RESTRICT AUTOMERGE Fix READ/WRITE operation access issues on Restricted appOps. am: e2471e03 am: 4671e089 -s ours am: b2b72ee1 -s ours am: fa9dd40d -s ours am: f4fc4704 -s ours

am skip reason: contains skip directive

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



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