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

Change-Id: If05114ca6ba0e675911117a10d241e7e50be545c