[automerger skipped] Merge "Fix READ/WRITE operation access issues on...

[automerger skipped] Merge "Fix READ/WRITE operation access issues on Restricted appOps." into udc-dev am: bc17b896 am: 71780fb7 -s ours

am skip reason: Merged-In I09008b365e36b2c20c9a1fe5a1d52699ddb17d35 with SHA-1 955e7807 is already in history

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



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