Merge the 2019-01-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Handle Unsupported Dimensions in Test App
  Adding check for min_width and min_height

Change-Id: I02b5e9566f13cf73ef04b8d268b865c0b36e0246