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

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