[automerger skipped] Skip ab/6749736 in stage. am: 30c8fc1fe4 -s ours

am skip reason: Change-Id I931e3434ad5b0ba5c23521cbfc62b7f660d0570d with SHA-1 a16cb3ef69 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/display/+/12796469

Change-Id: Idfe7340d00c9c35cc0ab2f93078397ebd5aeeda0