Merge "Explicit conversion" am: 160a22f49e

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

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