Merge "Revert "servicemanager: fix lazy service issues"" am: b60e7597b2

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

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