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

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

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