[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: c80a63db6a -s ours am: 85c9bffce2 -s ours am: d9e801b9b4 -s ours

am skip reason: subject contains skip directive

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

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