am 5c2cafaa: am aca0540b: am b63011af: am 9aa565e2: am db124f73: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev automerge: 0dfe152

* commit '5c2cafaad6eb9067d886299b95dd79e3829375bc':