[automerger skipped] Merge "[API Review] APIs in SubscriptionManager" am: 9f5fe99c7a -s ours

am skip reason: Change-Id Id0df707fb0512e063cfe4dc4aea40b8b6ed6ca58 with SHA-1 d68e5a2162 is in history

Change-Id: I8f099114c6c765aaefd3c9dcc832046c35c0eab3