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

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

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