[automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: f05298bdcc -s ours am: a158626035 -s ours am: 9a61126a94 -s ours am: 061630dc07 -s ours

am skip reason: subject contains skip directive

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

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