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

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

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