[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am:...

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 28e03152 -s ours am: 6a77265a -s ours

am skip reason: Merged-In I513a17f21790c3efa57c2896523723afd843bfb0 with SHA-1 f4083b8a is already in history

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

Change-Id: I4309655e5301c98932732cb0cc4ee6e7d9b6b066