Merge changes from topic "presubmit-am-3c9ab263243e45429a59a11d555c2861" into...

Merge changes from topic "presubmit-am-3c9ab263243e45429a59a11d555c2861" into tm-dev am: 9f1b7094 am: d5edb530

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



Change-Id: I091a9d93f6b7beb39fb8364d6cb2833e90fc4332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>