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

am: fd1529069a  -s ours

Change-Id: I77c5aecd2e2512bfd54eb43347e7ad303bf4340d
This commit is contained in:
sqian
2018-08-29 12:06:54 -07:00
committed by android-build-merger

Diff Content Not Available