am 235b01e3: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev

* commit '235b01e341d7a8d852c454d22cfe390b3cafc33d':
  Revert "Additional changes to SubscriptionManager API as per API council."