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

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

Change-Id: Ib95cc7f76351d842acf4110ca3c1d0d8c32ae22c