[automerger skipped] Merge "Add APIs in SubscriptionManager for opportunistic subscriptions" am: c0a2488df6 am: edf51aebaf
am: 8998d79b62  -s ours

Change-Id: I6ef7b593a648cc3f36d395646a926130987c02c2