[automerger skipped] Skip ab/6749736 in stage. am: 747653cfc3 -s ours am: 8c031e80a4 -s ours am: 861d994ea2 -s ours

am skip reason: Change-Id I4f500e713213d8ae749fdeb3780c8de896353faf with SHA-1 5cc08d0874 is in history

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

Change-Id: I4c0db992c4e886c9e04631a17d87ffce93453b6c