Merge "Merge "Test: Add testClearFormData to lollipop-mr1-cts-dev" into lollipop-mr1-cts-dev am: d922b399a5" into marshmallow-cts-dev