[automerger skipped] Skip ab/6749736 in stage. am: a14b455ec9 -s ours am: 40880c91b9 -s ours am: 0b0dd1b5e2 -s ours

am skip reason: Change-Id I26c57e6419abe6f812ca7c3003f6977fafa60cfb with SHA-1 3438fd95ab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12796094

Change-Id: I0447a5b4425fe4e7418e37de248eec43e4081a52