tree cca67b5bf6b72e637b45d3873004e1ba67b581ed
parent 63dbf254b5ba4ccd8e4975f857a960f7434bd571
parent 405e5f3c1536ad29a5a35bc1f601aafcf37aa6c5
author Meng Wang <mewan@google.com> 1575674861 -0800
committer android-build-merger <android-build-merger@google.com> 1575674861 -0800

Merge "SubscriptionPlan: move out of telephony" am: c4090312df am: 3172db5841
am: 405e5f3c15

Change-Id: I1c3921c9f10ac744a42490f1258fc67f30385b25