Merge changes from topic "misctrl" into main am: 3ed266f5ed am: 50652f1f94

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

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