Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev