[automerger skipped] Merge "Handle setAllowedCarriers() with empty list of carriers" am: 74dd849791 am: ddb075eeec -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: Ibe90ffa17febc1775c8c42293a0d0d581c649aa6
This commit is contained in: