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

Change-Id: I0c18a6dd4222442f7736ef6480dda9f1f905b6c4