Merge "Mark some virtual display flags as TestApi"