[automerger skipped] Merge changes If58ea542,I18c5e0f3 into tm-qpr-dev am:...

[automerger skipped] Merge changes If58ea542,I18c5e0f3 into tm-qpr-dev am: 3d43ec37 -s ours am: d1d706d3 -s ours

am skip reason: Merged-In If58ea5423f64420db3e5bd9307194b56129d6543 with SHA-1 b44702a8 is already in history

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



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