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

am skip reason: Merged-In I834cef250c160e68be0d5ce45438718ea08a39dd with SHA-1 6db7010dcb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/x86-64/+/15571756

Change-Id: I925ed9cac086a202f9528f81f37fe18f6fdfb544