[automerger skipped] Merge "Use new SubscriptionInfo constructor" am: e8e24e7e0b
am: 188272e12b
am: d78a882bb1
-s ours
Change-Id: Idffe865742097d74f4d5373a41c5c2cf240f0032
This commit is contained in: