Merge "Merge "lazy AIDL services: test multiple callbacks" am: 1b04091c am:...

Merge "Merge "lazy AIDL services: test multiple callbacks" am: 1b04091c am: fbae9509 am: 217f5258" into udc-dev-plus-aosp am: 231177e5 am: 24bbf6b4

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



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