[automerger skipped] Merge "Fix a type conversion bug." into udc-qpr-dev am:...

[automerger skipped] Merge "Fix a type conversion bug." into udc-qpr-dev am: e958fdd5 am: c49a495b -s ours

am skip reason: Merged-In I8826e2c0ba6c3e26af858a1d8f1388b75d537082 with SHA-1 76aaef44 is already in history

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



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