[automerger skipped] Merge "Add @NonNull in SubMgr#getOpportunisticSubscriptions return value." am: 923bbad67a am: 93b95bf693
am: 9932f74257  -s ours

Change-Id: I6c2cd7ce4c63f876a48dd922161f25d4d0d0fa75