Merge "Fix implicit conversion" am: 3dc9190ac4

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

Change-Id: I47a8c8c69653e87890a4d5f196270ae630517ac1