Merge changes from topic "presubmit-am-3c9ab263243e45429a59a11d555c2861" into tm-mainline-prod am: 17379697bd

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

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