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

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



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