Merge changes from topic "am-9297b50ad89540fd83a24fa9c9d54f79" into main

* changes:
  [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: 4010bcab -s ours
  [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