Merge changes from topic "presubmit-am-7a6e71eafa1b4d2399629cd748f22c65" into...

Merge changes from topic "presubmit-am-7a6e71eafa1b4d2399629cd748f22c65" into sc-qpr1-dev am: ecb6b5c2 am: 6b0e2b81 am: 04c10a92

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

Change-Id: I8ae9ba12cc6d16f936350dcc4e25a138583c9646