Merge changes from topic "presubmit-am-9c383cc1bdfa4a9aa3667800dd5e6d6f" into sc-dev-plus-aosp am: 4154dfc767 am: 680a1e7263 am: 406389b6dd

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

Change-Id: Id573b7e3e10ef45e3a8c58bdd93bb08054195b2d