[automerger skipped] Merge "Clean up SubMgr#getOpportunisticSubscriptions." am: 103d515c80 am: b4750ecffa
am: a5c0f26e51  -s ours

Change-Id: I0f2859d8d3a9596d32f4e6062363ea72318de0d1