[automerger skipped] Merge Android 12 am: 76cb35b684 -s ours am: ab5afe42ad -s ours

am skip reason: Merged-In Ia96b39cc2cea72949f10593952abfb9f9901d682 with SHA-1 5386c40088 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/1847604

Change-Id: Ic6c107470286a31e33fd9644d77f5d460ca4085d
tree: 8664fa854ed590f3ad3e1a4385ba699428105d4e
  1. common/
  2. devices/
  3. .clang-format
  4. Android.bp
  5. METADATA
  6. OWNERS
  7. PREUPLOAD.cfg