Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0

am: 6d46d98598

Change-Id: Ifed7dac40564cd322ea75c14db6b9e1827794507

telephony/java/android/telephony/SubscriptionManager.java

@@ -1340,6 +1340,7 @@ public class SubscriptionManager {
      * @param slotIndex the slot Index.
      * @return subscription Ids or null if the given slot Index is not valid.
      */
+    @Nullable
     public static int[] getSubscriptionIds(int slotIndex) {
         return getSubId(slotIndex);
     }