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

Change-Id: Ia2bf315c236678d34d773e210e95d6d82efa0d32