Merge "Fix CtsOnGsiTrebleFrameworkVintfTest" into pi-dev
am: 77d95b55fb

Change-Id: I1cd037cff32d5832642f47d86f1029b9bcb28d8b