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

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

Change-Id: Iac61257200567169e429843f15f1b71ae43f262c