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

Change-Id: I19d522d2ea25549f92de9494f4e60b4af2ebe34b