add carrierid in subscritionInfo so that apps can get
subId, carrierid and other sim related info from a single call
Bug: 119676543
Test: gts SubscriptionInfoTest
Change-Id: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45
(cherry picked from commit 0034bb393c)
Merged-in: Ia2d01ad6bd59565adbf989b4d95e7f64f3ee6d45