[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: cb6726460e -s ours am: 2080123097 -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: I5572bdc894787c45384e3d83cd747c27cda6b0e1