Merge changes from topic "presubmit-am-9c383cc1bdfa4a9aa3667800dd5e6d6f" into sc-mainline-prod am: 08208e6f6a

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

Change-Id: I83c6c36bfe47fd821680c8114defa22b7e6990af