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

Change-Id: If811fb5316f51bff800c548266ea1cede29c4279