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

am skip reason: Change-Id Ia07654af55d2da376c43d23fc5dcdee87e43264b with SHA-1 0712efa825 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/uml/+/12796855

Change-Id: Ib0128d26efa75d8e969ff344e8416872ef3d960a