[automerger skipped] Merge "Do not filter by APN_SET_ID for emergency APNs"...

[automerger skipped] Merge "Do not filter by APN_SET_ID for emergency APNs" am: b8e1d9b5 am: 88d65b6d am: bbba0756 -s ours am: 8a11f9a9 -s ours

am skip reason: Change-Id Ie435a285aa5a7c1d6e3f3983cdc1892757ce78a5 with SHA-1 fd100180 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1428974

Change-Id: I33b6f3780a7c3ebc77a646b73925d8d31273ca0a