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

Change-Id: I63246ba54d112ef75ca6989c16d7ae979bde552a