Merge "Add RootTargetPreparer to CtsOnGsiTrebleFrameworkVintfTest" into pi-dev am: 66d8308896
am: e844d18270

Change-Id: I6f0fbe0fc1d0d527ffe2231e7f2780de9f8d188b