[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: d1ecf292 am: 71669246 -s ours am: 5f361440 -s ours am: 035dfdb6 -s ours am: e6e330fd -s ours

am skip reason: contains skip directive

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



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