Merge "Add CARD_ID in SubscriptionInfo database"
am: afa7e35199

Change-Id: Icd782db204a5f157a82e26d78e49c4bcdbcfa473