Merge "Add CARD_ID in SubscriptionInfo database" am: afa7e35199
am: 39f007a4db

Change-Id: I614958512ff6e60e8558b68172eb4158458cefa0