[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: cb6726460e -s ours

am skip reason: Merged-In I743ce25b43b75e9c2ee24580749a292608d16313 with SHA-1 152fe81f90 is already in history

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

Change-Id: Ie7c6486386ad9830aa49905d9e0dd14ad13e31e9