[automerger skipped] Merge "Remove old SubscriptionInfo constructors." am: 03fcb263ab am: a009bfe6e1
am: 9e07ab7689  -s ours

Change-Id: Ic0bcdd00338e681598cec558fd32f52ed98d48f8