tree fd28448960a5f3418d44da1e8b702277bdb852c6
parent f182a1e8d6073a55dcfdb030e19f9df9278ae83f
parent 088c61aaf44cfcc02675e540d64b604de6143157
author Meng Wang <mewan@google.com> 1575669811 -0800
committer android-build-merger <android-build-merger@google.com> 1575669811 -0800

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

Change-Id: Idefd8043655b3ab11b62f73a36989a149db35856