[automerger skipped] Merge "Handle setAllowedCarriers() with empty list of carriers" am: 74dd849791 am: ddb075eeec -s ours am: 732f7ef4d2 -s ours
am skip reason: Merged-In I9779180ff1c3e926f97e010ca6026c5fb950046d with SHA-1 898e2b53a7 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1977909
Change-Id: I12a8615fc581722a50c1629977265be94f9d3a1c
This commit is contained in: