Merge changes from topic "presubmit-am-7a6e71eafa1b4d2399629cd748f22c65" into sc-mainline-prod am: 65884526a1

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

Change-Id: I97216fe2641e3f9ec225839320434a0e4d2aac72