[automerger skipped] Merge RP1A.200720.011 am: 1a82c1f1a1 -s ours am: c1a49d40b7 -s ours am: ea0cf8cad8 -s ours am: 84e9f172f1 -s ours

am skip reason: Merged-In I4c565040e9300bb7f6e98df1a5a878af5df9d1c7 with SHA-1 3e4465f5ed is already in history

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

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