Merge changes from topic "am-aa9bbbb6e81a44e2911c38d0259a6654" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c am: a9c08f43 am: b2e6bdfc -s ours am: 1411e29a -s ours am: b9161617 am: 85597ef7 -s ours am: 53e36247 am: edf72b98 am: 0f648072
  [automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0a am: c2a8913c am: 12b25096 -s ours am: a5f045da -s ours am: f6d5e9ea am: 67c9729b -s ours am: c53f9fcd am: 08e1fc6b am: 880d0ff3