[automerger skipped] Merge "Update ApnConfigTypeRepositoryTest with new...

[automerger skipped] Merge "Update ApnConfigTypeRepositoryTest with new priorities" am: 35e4de19 am: bea5bbd6 -s ours am: 9ad5d238 -s ours am: ec7976a9 -s ours

am skip reason: Merged-In I9806fd934717e5269d7ba37456b38fbd83bf7b36 with SHA-1 5a0d2a8e is already in history

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

Change-Id: I8deca55f478dff0aa80d7ec5737fc64d84b9e4b3