HAL changes to remove the carrierId

Bug: 189884347
Test: Build successfully
Change-Id: I8a9ffc5f631c2ecb26e0a5f2d3ee1ccc9a0f853f
2 files changed