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

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

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