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

Change-Id: I545166bd11ee2a38b43743ebb4559429e1b22349