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

Change-Id: I0ae7fc6c2742a6bedb3f5e5e71f18625ff6e520c