Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
automerge: 29bb86a

* commit '29bb86a749051e675b5c4cd304feaaeb796c9b81':
  Revert "Additional changes to SubscriptionManager API as per API council."