Merge changes from topic "am-e519fa97a79e4646ae15a54b8cdeb978" into android13-tests-dev

* changes:
  [automerger skipped] Merge "Merge "Camera: Revise hardware level requirement for MPC" into android12-tests-dev am: 49e73bef1e" into android12L-tests-dev am: 0c49ba971b -s ours
  [automerger skipped] Merge "Camera: Revise hardware level requirement for MPC" into android12-tests-dev am: 49e73bef1e am: c921f16149 -s ours