Merge "Revert "Testing AIDL delegator class with RPC"" am: 35de4cf0f1 am: a700ae69c8 am: 371fcf9f7b

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

Change-Id: Ie5c96804326237c9b6d0feb4c053936ad5186225