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

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

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