Merge "SubscriptionPlan: move out of telephony"
am: c4090312df

Change-Id: Ie6ceceab0e83fb17d8a2ba964d3b0041e64e0598