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

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

Change-Id: Ibf5e1db9a38167caad1398588ff19f311ae3a79d