Merge changes from topic "presubmit-am-3c9ab263243e45429a59a11d555c2861" into tm-dev am: 9f1b7094ba am: 5aec548e4f

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

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