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

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

Change-Id: I8c11d53b29107b8731d5ffe0791eaf9f13879e6e