[automerger skipped] Skip ab/6749736 in stage. am: db2c7c5552 -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: Ie3b719ecdf7c7da7457f9a06152478d00fcd3005