[automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd
am: f695abfc29
-s ours am: 74304904c7
-s ours am: e997d9850c
-s ours
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad
is in history
Change-Id: I8d6c6910d56b54ed772ea67fdef9440ad214e184
This commit is contained in: