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

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

Change-Id: Ib5352d55863d1268fc5c98b7254cd0ba4e30e524