Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179 am:...

Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179 am: 6bb7b601 am: cee9937e am: cfb97964

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

Change-Id: I56bfeb86b424097f4b96a881939b48fdc016a26f