tree 8324be54602b6b9de5b780bd9f17564e1744c162
parent fe75f77c637fd4b628079015086b50c09eedfefa
parent 7042e757eb5bbc8563d8ea6c63ea8b8b38b08acf
author Jordan Liu <jminjie@google.com> 1595536976 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595536976 +0000

[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