Merge "Fix HidlUtils::deviceAddressToHalImpl for HAL V4--6"