[automerger skipped] Merge "[API Review] APIs in SubscriptionManager" am:...
[automerger skipped] Merge "[API Review] APIs in SubscriptionManager" am: 54af9046 am: d68e5a21 -s ours
am skip reason: Change-Id I77cad8f828ac38976355b7a5f3e8d757b73694ca with SHA-1 ff7f25ff is in history
Change-Id: I3b07f765ad74c9f00711ff98ca3c79dfc7f849fb