Merge "Revert "Update HAL 1.6 for 5G Slicing""