Merge "hidl_test_java interfaces: use generic interfaces" am: 730aef9a78 am: 10f1f66898

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1445778

Change-Id: Iacea8219291e1ac345a85fef3c44b1dc01936e43