am 15fa80f8: am 5ce5ec95: Merge "Use SubscriptionController instead of SubscriptionManager." into lmp-mr1-dev

* commit '15fa80f8937bf4c78e0d2ec07c4571c4eaf21c3b':
  Use SubscriptionController instead of SubscriptionManager.