[automerger skipped] Merge ab/7061308 into stage. am: 45c6e36a2f -s ours am: c5ba6509a7 -s ours am: dd7331510d -s ours am: d898e3892d -s ours

am skip reason: Merged-In Ia0452af423a3c4bcc581476cfe8637df3876cefc with SHA-1 8d2bcee7eb is already in history

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

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