[automerger skipped] Merge "Remove static for getSubscriptionIds" am: 9a9dbf05e0 am: 0be2ef9746
am: 1054427c0c  -s ours

Change-Id: I36287ce078a9fe4ff58380650019e062a4b14ce7