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

Change-Id: Iab70b91e4a39c2c77d834977cdc4734875ae947b