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

Change-Id: I12223be235ec60ef67c8e327226b816d7843bad9