[automerger skipped] Merge "SubscriptionInfo contains int cardId" am: 97c9aba888 am: 212e2576e1

am: 5151b7df4e  -s ours

Change-Id: I4cc1de8dc513c4485ea97c6df2c559ad395b02f7
This commit is contained in:
Jordan Liu
2018-12-21 14:28:37 -08:00
committed by android-build-merger

Diff Content Not Available