am 3fdec6f0: Revert "Additional changes to SubscriptionManager API as per API council."

* commit '3fdec6f0bce8bcbec7c6685a43a32e1a1425e2bf':
  Revert "Additional changes to SubscriptionManager API as per API council."