Merge changes from topic "am-a020b014c462452180a024d012ebe9a6" into tm-d1-dev-plus-aosp

* changes:
  Merge changes from topic "revert-19245451-revert-2022-20240-VLEDXGPPND" into sc-qpr1-dev am: 6dbc88f6 am: 125e6f98 am: 4fea8bf2 am: b894d274
  [automerger skipped] [automerge] Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..." 2p: f21335c4 am: 0440b685 -s ours am: dee4feed -s ours am: 551d1b85 -s ours am: d7dae129 -s ours