Merge "Revert "HIDL Java getService now the same as C++."" am: 65d1e549b6 am: 4868f5311e
am: b29739e1c9

Change-Id: I0a11131c6736f03b15e967990edbbbd47b6537ed