[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e3a0d56c87 -s ours am: 737dd93fd9 -s ours am: 6d350d3178 -s ours

am skip reason: Merged-In Ifb1707cc54d9b279d7f48f9aa94b5d79fd3743ec with SHA-1 f90b16d374 is already in history

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

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