Merge "Add CARD_ID in SubscriptionInfo database" am: 6745e15d17 am: 33de998afe
am: a8a799b6a6

Change-Id: I2ba99e9fe94621b982a74cf6178afbfc64d32ee2