Merge "SubscriptionInfo contains int cardId"
am: 97c9aba888

Change-Id: Id6b54154e2a01be5bceb16b1884d9751b3c9cf80