[automerger skipped] Merge "Make sure Apns are not returned for a sim that is not active Regression on b/144977430, ag/9869063" am: ea7bf19494 am: cc41acd683 am: 118ccabaef am: 1aa5c8cfa2 -s ours

am skip reason: Change-Id If66e974e1e1ba655ffcd124ccc448b97fba19ee6 with SHA-1 743096e5e9 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1360800

Change-Id: Icce08b851e8eced36f6a46a33339f3b5d63feee6