am 0c6b03d4: am 43b1b930: Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev

* commit '0c6b03d41b79d28b120df91806dc41f8024fdd40':
  Added layout tweaks to handle small screens for CTS Sensor Test.