[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: aa87aa8f3a -s ours am: 58ec4c9f4a -s ours am: 046f4f73d8 -s ours am: 7b6eb70334 -s ours

am skip reason: subject contains skip directive

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

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