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

am: 968927d7ff

Change-Id: Ia2bf315c236678d34d773e210e95d6d82efa0d32
This commit is contained in:
Meng Wang
2019-12-06 13:52:01 -08:00
committed by android-build-merger