Merge "servicemanager: fix lazy service issues" am: 355cafc805

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

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