Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev