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

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