[automerger skipped] Merge "Revert "Update SubscriptionInfo constructor"" am: 87fac17673  -s ours
am: 306c969a6b  -s ours

Change-Id: Ib48f0544e30fea74de84d5f25a6ca8d8b21eb460