Merge changes I452e051c,If35ceac5 into oreo-cts-dev

* changes:
  CTS: support small screen sizes for imageview test
  Add watch specific resource file for calendarview_layout