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

Change-Id: I42f48d593d11d6bffd0881aaa95fa2df42158b7f