Merge "Fix a type conversion bug." into udc-qpr-dev am: e958fdd5

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23882514



Change-Id: Ic1d16bba1245b9e6d6c6458e79fdf6bb33f431e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>