Merge "sm: lazy service - fix race" am: 70476fbd8c

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

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