[automerger skipped] Merge "Filter preferapnset results to only current carrier" am: 5c3aa5aae3 am: 0d22dac305 am: 7042e757eb -s ours

am skip reason: Change-Id I29b2a143368e4732f67f59059ec281ae62b25a59 with SHA-1 748c832f0e is in history

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

Change-Id: I1c290a09fbb49c7bd42a8d30d7b1d92b181af490