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

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