DO NOT MERGE release latest carrier id on SDK30

the change include update for Shaw Mobile

Bug: 179495729
Test: Build
Change-Id: I5604b6c899e3c3d669556a9fdbef568bbaa1e29c
Merged-in: I18d093e894fc300eeff4aad767972cc1756fcc9e
2 files changed