Merge "android.os.HwBinder.getService() in Java respects VINTF." am: 01f374c635 am: 71e77c865b
am: 2e943c5379

Change-Id: Ibbf18bc51e146abef1ab211614a98ec59031b1b9