Merge "Projection Widget Test: Remove two unnecessary buttons" into lollipop-mr1-cts-dev