Merge "Revert "Clean up SubMgr#getOpportunisticSubscriptions.""