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

am: 3172db5841

Change-Id: Id061cab31b2bf810a889abf0f31b39b322f346ae
This commit is contained in:
Meng Wang
2019-12-06 15:22:54 -08:00
committed by android-build-merger