Merge "[API Review] APIs in SubscriptionManager" am: 54af9046ac

Change-Id: Id0df707fb0512e063cfe4dc4aea40b8b6ed6ca58