[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: dd5559bb78 -s ours am: 83df0bff8c -s ours am: b3a81d6d88 -s ours

am skip reason: subject contains skip directive

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

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