Merge "lazy AIDL services: multiple callbacks" am: 1f0165d6fa am: ec14d4f159 am: b92ce72033

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

Change-Id: I2f34ec0d35cabadf0d1169271dd4f8c50512439d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>