[automerger skipped] Skip ab/6749736 in stage. am: 2735ac947a -s ours am: c2fb251e75 -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: I1c22bd452d8dbd99e9ce27e82c62517e07a267c6