Merge "de-HIDL: HAL and Callback" into main