Merge "Yet more minor fixes on User HAL:" into rvc-dev am: f04be179a7 am: 59b6c890c2 am: 59f16828ee

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

Change-Id: I9b05df7cd6e4571912aa0b5f4d8395b9360ab8a4