[automerger skipped] Merge "[API Review] APIs in SubscriptionManager" am: d4da70fe2f am: 80674bcf6f -s ours

am skip reason: Change-Id Ibedb3182537c5ced2dbb82db155b2b66f233ac7a with SHA-1 b8e281d076 is in history

Change-Id: Icafdadf3271cc8a29c2f7cf814556935dbdfdae2