[automerger skipped] Skip ab/6749736 in stage. am: 7a644125f0 -s ours am: 9990e13ece -s ours am: 6734fcf840 -s ours

am skip reason: Change-Id I3d63536f32308cfe12591dd61557f5ae0de92472 with SHA-1 5e1093eff0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/ti/beagle-x15/+/12795829

Change-Id: Ief3bcfd2ae3373cb1928c9dda5db5d4c499cf5e1