Merge "Clean up SubMgr#getOpportunisticSubscriptions."