Merge "LazyServiceRegistrar: race w/ register & onClients" am: d6afe2eb4b

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

Change-Id: Ib28c778974bf16e3f1511cbfb9f7b33831d8dc4f