Merge changes from topic "presubmit-am-097823625c894f40a398a9161a360e95" into sc-qpr1-dev am: d722532fc4 am: 43f2167ad6 am: 94a05aa7f0

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

Change-Id: I7f99e7bcd5a4d126390b41d78d60381dc0ec4c53