Merge "Filter preferapnset results to only current carrier" am: 5c3aa5aae3 am: 0d22dac305

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

Change-Id: I2af8bc0c383639ecbee7adf48b8e0cdf10cf79cb