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

Change-Id: I9d41228e3c7b2e1ba979aff97492205e97b056dc