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

am: 052f207b42  -s ours

Change-Id: Ic6f3763761f13361d21d14594042011e797099f1
This commit is contained in:
sqian 2018-08-29 11:54:50 -07:00 committed by android-build-merger
commit 222caea32d

Diff content is not available