[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 9dbd87edc3 am: de19b256ef -s ours

am skip reason: Change-Id Ia41629ffb2acad0754555814dafedc98500996a1 with SHA-1 3b2a73ba08 is in history

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

Change-Id: I7cdbd6687eb1c17ca23328690487bcc694615d3a
tree: 8c464cdc944a094c477f1f701525fbffc356f561
  1. common/
  2. devices/
  3. .clang-format
  4. Android.bp
  5. PREUPLOAD.cfg