Merge "Reland "HIDL Java getService now the same as C++."" am: c1616f6820 am: 0c6f0240b2
am: be0f18fe3d

Change-Id: If15ebb8582478ebcc8d45a2ace0c8f2825932dc9