Merge changes from topic "servicemanager-recovery" am: 865cf90387 am: ab36e4a8c1 am: d155cc7086

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

Change-Id: Ieb7a16f16db4def05654a0e1146bb1d3ea5b1a5b