Merge "Revert "servicemanager: fix lazy service issues"" am: b60e7597 am:...

Merge "Revert "servicemanager: fix lazy service issues"" am: b60e7597 am: c0683381 am: 3a92433b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2417919



Change-Id: I78592dba1d2247e77c49f2ecd4c3bd2f3243bfc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>