[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 38247b4031 -s ours am: c0462e3e4a -s ours am: 87d4bf52c5 -s ours am: 256ef7dffa -s ours

am skip reason: Merged-In I2b488741827d03bbb4ff21de562ebaf9e80656be with SHA-1 b0ac1da2f9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish-kernel/+/13121541

Change-Id: I2a32f4b9427fc0fa1ffe4c8449cc61cc31d81f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>