Merge "hidl_test_java interfaces: use generic interfaces" am: 730aef9a78 am: 10f1f66898 am: 1acc567952 am: 5b436e33ef

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

Change-Id: If5afd00334e8b09250df1ae97dec9285e39ad930