Merge "SubscriptionPlan: move out of telephony" am: c4090312df am: 3172db5841
am: 405e5f3c15

Change-Id: I1c3921c9f10ac744a42490f1258fc67f30385b25