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

am: 088c61aaf4

Change-Id: Idefd8043655b3ab11b62f73a36989a149db35856
This commit is contained in:
Meng Wang
2019-12-06 14:03:31 -08:00
committed by android-build-merger