[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: 8ca4991dd6 -s ours
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad is in history
Change-Id: Ic605fc8b2a2d32dae7c6f690b446a5a5079436cb
This commit is contained in: