Merge "Add @Nullable for getSubscriptionIds"
am: ceceb459e0

Change-Id: I37c72d12966e962838bb66f5cb52a8ab02a4ac34