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

Change-Id: Iaecc9ed426b7649e1b5009e7c78397a8ffe16563