Merge "[API Review] APIs in SubscriptionManager" am: d4da70fe2f am: 80674bcf6f

Change-Id: Id60cda7e438a0b54794c241f3f9132c5d71ef30e