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

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

Change-Id: Ice0619bb309a655eed08d9875add2f398436972c