Merge "Clean up SubMgr#getOpportunisticSubscriptions."
am: 103d515c80

Change-Id: I5dc75bd9b1a8e64df547f621e6792e4816167be7