[automerger skipped] Merge "[Mainline] Use public method in...
[automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2 am: f695abfc -s ours
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9d is in history
Change-Id: I3e3d9481426bbb02dc7be34dfabd95a35731cda2