tree 0e69532990b588000883d4636fc8e1bab7626e5f
parent 3d6307dc88997cfa05dbc77edbd4c6acfd9d748f
parent 55882e9047843193344650dbe8c498f08250afa5
author Yifan Hong <elsk@google.com> 1637214760 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637214760 +0000

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

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

Change-Id: Iad0208f3fa47a3c4a8d23b7f5bfd59c690a26b91