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