Merge "support query & update carrier id for current subs" am: b96c5ae37b
am: f9d037cb3e

Change-Id: Ic20417a7be311df62fdc635949f63349277bd1d0