[automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd am: f695abfc29 -s ours am: 74304904c7 -s ours

am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad is in history

Change-Id: Ia7f6d8c97eb96ad8188df5740d1769e574f7e313
This commit is contained in:
Betty Chang
2020-03-19 05:04:45 +00:00
committed by Automerger Merge Worker

Diff Content Not Available