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

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

Change-Id: I435579cef189339e362c48837657f1ef2f97352e