Merge "Fix implicit conversion" am: 3dc9190ac4 am: d1f4724166

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

Change-Id: I4920e1c5ecf50ce1b5cba496a02581cdf476e006