Fixed EmulatedUserHal merge issues.

Some changes were not properly auto-merged, and it's quite impossible to
cherry-pick them automatically (using git), so this CL is manually fixing
it.

Test: adb shell lshal debug android.hardware.automotive.vehic
le@2.0::IVehicle/default --user-hal

Bug: 150413515

Change-Id: Ibb8bef2c1ae8df32369dff5c5e5de76480b3a66f
Merged-In: I5c8b99b8027b5ec10ace323d872cd85f9a0d4177