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

Change-Id: If691a66bee0ed00daf3965274c1ad63bf9c37703