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

am skip reason: Change-Id I164bb65835bac8d60cd5b9d21b698ed9cc611dc0 with SHA-1 501c2de16a is in history

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

Change-Id: I7385ff729b7e334f563c5db362604d750aa56ab1