[automerger skipped] Merge "Merge Android R" am: 251f430d51 -s ours am: 3193e4c719 -s ours am: 7c89c7cd82 -s ours am: cf7bc20525 -s ours am: 63bf3a19c8 -s ours

am skip reason: Change-Id I7f1093c37003f7b757dac9c77f191813e5b01e2a with SHA-1 de73fb37cb is in history

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

Change-Id: I9d710983bf14f55b9cc304b1f6f9550068a1c111
tree: 36ffe6a959960f8999247768e40a2fe1813cae32
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk
  4. METADATA