Merge "servicemanager: fix lazy service issues" am: 355cafc8 am: b9fa27e7 am: e622f3bd

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



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