Merge "hidl_test_java interfaces: use generic interfaces" am: 730aef9a am:...

Merge "hidl_test_java interfaces: use generic interfaces" am: 730aef9a am: 10f1f668 am: 1acc5679 am: 5b436e33 am: 7a4a65d6

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

Change-Id: I1620c3f9386c9c42ff0695ec718f9178f008da85