Merge "LazyServiceRegistrar: race w/ register & onClients" into sc-dev am: 6c9d404098

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

Change-Id: I5cbe6c6fcfbd4fdbe9ebd12f7c1831eaf939e114