Merge "Fix implicit conversions" am: c6b9ee3705 am: 5816304fa3

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

Change-Id: I1660a320f2688dc5e34bddeec3237d8c3646846a