[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 831a55e093 -s ours am: 549356ede6 -s ours am: e3d59ebdd2 -s ours am: a0803735ae -s ours

am skip reason: Merged-In Ie57a0453d007e6eb2d21ccbfe11888f8182ade36 with SHA-1 92aff59ebe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/5.4/arm64/+/15571753

Change-Id: Id574a041ff160ff2e67336424325db16754e33e6