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

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

Change-Id: I4d99cb1d89ca49f493798eede6e0afcaf59360c0