[automerger skipped] Merge "[API Review] APIs in SubscriptionManager" am:...
[automerger skipped] Merge "[API Review] APIs in SubscriptionManager" am: c43a3b5a am: f129f159 -s ours
am skip reason: Change-Id I80a51d2b82453b2bad5bd14a068f6f74024e1894 with SHA-1 ada9f0e4 is in history
Change-Id: Id37e33dd9140182cd76e29f9140d5e16b3dcf776