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

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

Change-Id: Ib543ab2e641734d91ea87339995f50bbc10bae5b