[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: d96811527f -s ours am: 24689652e0 -s ours am: a7a6316e95 -s ours

am skip reason: subject contains skip directive

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

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