Merge "Update android.hidl.manager-V1.0-java to V1.2"
am: b9e216c2b6

Change-Id: Ic66313072193f54835cc6aa0be7f6b98367f52ee