tree 4819afce7dcf9b0f8e18779db9f50f87c1f43bb6
parent bf28d2b44beb6dbf752b4c576136a4b76ed7554a
parent d155cc7086efa141fb0183dfb04db9b143465041
author Yifan Hong <elsk@google.com> 1637213689 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637213689 +0000

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