Merge "Fix NativeHandle return in TV Input HAL 2.0 default implementation"