[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e6a4459d0 -s ours

am skip reason: Change-Id I7fe9d15b49fd2c43428e007d2af0e18a4fbf36fa with SHA-1 e3f027d5aa is in history

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

Change-Id: Id0b2f89e98ea01d16b888d1615a6f6ab97cff981
tree: fc1c24a85b24109155471a4eb7deb62269596332
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk
  4. METADATA