Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev