[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: d7356406 -s ours am: b971e8a7 -s ours am: 0d18951e -s ours

am skip reason: contains skip directive

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



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