[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: c80a63db6a -s ours am: 85c9bffce2 -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: I10261fbd3b9a06f5b697f5068e56b839e11e3857
Signed-off-by: Automerger Merge Worker <[email protected]>