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

Change-Id: Ib6287ee35e2ec1c2d64a067e1e136e18c27eb777