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

This reverts commit 8225032624055a3c5bb8dd10c65b829f8b400061.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id620937aec1e19d541c6d1529e97d91292565c6e
3 files changed