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 am: 3e750df5

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



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