Merge "Revert "HIDL Java getService now the same as C++.""