[automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev am: 052f207b42 -s ours

am: 222caea32d  -s ours

Change-Id: I7854d76e479809882cde2b1b57e87cacf075cb84
This commit is contained in:
sqian
2018-08-29 12:13:56 -07:00
committed by android-build-merger

Diff Content Not Available