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

Change-Id: Ib673442ea70d0f88f242a76cf1345923efb79431