Merge changes from topic "presubmit-am-7a6e71eafa1b4d2399629cd748f22c65" into...

Merge changes from topic "presubmit-am-7a6e71eafa1b4d2399629cd748f22c65" into sc-qpr1-dev am: ecb6b5c2 am: 27b4deb6 am: 305fbdca

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

Change-Id: Iec2b0b2c7215ac93d9e5c61cc464c41336aaca0e