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

am skip reason: Change-Id I7fa2e7b22b65107e2bf205c54fe38a5dd15a07d3 with SHA-1 1ea2b45e64 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/12796108

Change-Id: I868dd4d9e968c9f1b8b3033f89bfc2e9ae198e6b