Merge "Remove static for getSubscriptionIds" am: 9a9dbf05e0
am: 0be2ef9746

Change-Id: I05f6d006c949cce7a4604390ec2a4cb170b5ffa5