Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0
am: 6d46d98598

Change-Id: Ifed7dac40564cd322ea75c14db6b9e1827794507