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

Change-Id: I3df57fc50d9e928d74c50b2b99fde63e757e7e78