[automerger skipped] Merge "DataProfileManager check for MATCH_ALL_APN_SET_ID"...

[automerger skipped] Merge "DataProfileManager check for MATCH_ALL_APN_SET_ID" am: 9a9f83ec am: f6b8d78b am: e4242a30 -s ours am: 315e6cf2 -s ours am: 5993ceaa -s ours

am skip reason: Merged-In I4f9e18f711783f231d40069fff0e7672ee115f24 with SHA-1 e6db2970 is already in history

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

Change-Id: I594f0b24e3754a59261f79318703dc6ac0df75ed