Merge "RESTRICT AUTOMERGE Fix READ/WRITE operation access issues on Restricted...

Merge "RESTRICT AUTOMERGE Fix READ/WRITE operation access issues on Restricted appOps." into tm-dev am: aab9efd9 am: f8c22285

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



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