[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b3896c679e -s ours am: 7428812159 -s ours am: d757c4c90d -s ours am: 73f4ba0967 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/12578853

Change-Id: I2a2f727c51fd8c5f3ea6b9293cf7a41fe5efb9a1