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

* commit '9aa565e2a8c35b8325565dc5df964dba254307fe':