Merge "Explicit conversion" am: 160a22f49e am: 3c745ce814 am: 33e9c08107 am: 3aa5895a2f am: aca6491feb

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

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