Merge "Fix SecurityException at getActiveSubscriptionInfoList() on N and O"