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

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

Change-Id: Ic8be17de178085886292898e3322ec072ec16a62