Merge "Fix implicit conversions" am: c6b9ee3705

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1351048

Change-Id: Ibb0df7df249fca2507e1826e39a63ca47dd4b0db