[automerger skipped] Skip ab/6749736 in stage. am: 635a8b3ace -s ours am: 4d95ba81ee -s ours am skip reason: Change-Id Ic1fab99f1ec3b41e57f10af9231aac00ef7fc5ca with SHA-1 21e66a8d66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/12796870 Change-Id: I13dc73ee1ade24465abf571cee8ad65a1ab9b61d