Merge "sm: lazy service - fix race" am: 70476fbd am: 871d3986 am:...

Merge "sm: lazy service - fix race" am: 70476fbd am: 871d3986 am: b1f0d8c0 am: 52e27b2c am: 006ca4e3

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



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