Merge "Have FrameworksVcnTests access hidden API"