Merge "SubscriptionPlan: move out of telephony" am: a11df59bb4 am: 968927d7ff
am: 088c61aaf4

Change-Id: Idefd8043655b3ab11b62f73a36989a149db35856