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

am skip reason: Change-Id I2fd667167b676046d2816a483a93641d1784d704 with SHA-1 e2cf6c5aec is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libavc/+/12797051

Change-Id: Ic9e923fa90e9b9d46366f34b9a381a438b16c6eb