Merge "Make sure Apns are not returned for a sim that is not active Regression on b/144977430, ag/9869063"