[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: 47e6dd1b -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: I8cbbb043a9e6d8db76071684d186a62fdba7087b