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

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

Change-Id: Ifc1c35b3d1c2ef802f9e1564f75d750f7554f6e8