tree 9e7bba20ddcaa4e0339d33c2ff2419f03f99fa9d
parent 71c4cce674055df30c1e184fb5c31d2b459c9d01
parent 865cf90387989e6d021faba9c1946781039c6b03
author Yifan Hong <elsk@google.com> 1637211701 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637211701 +0000

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

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

Change-Id: Ib543ab2e641734d91ea87339995f50bbc10bae5b