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

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

am skip reason: Merged-In I9e61a1c958d82035d49eb84e6ae71dba00019c43 with SHA-1 7a5889cc is already in history

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

Change-Id: I8fdd3e1b927e7b34962735c20f405358e3e2d06f