Merge "Add @NonNull in SubMgr#getOpportunisticSubscriptions return value."
am: 923bbad67a

Change-Id: I8369201f38bdb9e288901c53e25b38bbb195faf7