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

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

Change-Id: I0fd0c9294de289f8eb651a9d99dc621958773481