[automerger skipped] Merge "LazyServiceRegistrar: race w/ register &...

[automerger skipped] Merge "LazyServiceRegistrar: race w/ register & onClients" into sc-dev am: 6c9d4040 am: cd9e166a -s ours

am skip reason: Merged-In I9e61a1c958d82035d49eb84e6ae71dba00019c43 with SHA-1 21fa7925 is already in history

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

Change-Id: I43596c4c1a18b321580a0f8ed2f5c68e4d077d15