Merge "lazy AIDL services: multiple callbacks" am: 1f0165d6 am: ec14d4f1...

Merge "lazy AIDL services: multiple callbacks" am: 1f0165d6 am: ec14d4f1 am: b92ce720 am: 25af133b am: 9c62c4c7

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



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