[automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev

am: 052f207b42  -s ours

Change-Id: Ic5d81115fef7c0b36231a20e2a032db8a8d6102c
This commit is contained in:
sqian
2018-08-29 12:01:52 -07:00
committed by android-build-merger

Diff Content Not Available