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

Change-Id: I37c99d5135046c6b0d2589f321cd8e4b235392e7