am 2f9f62e6: am 85ac1535: am ba5ed70d: am ba893966: (-s ours) Disable screen pinning test on watches and tvs. DO NOT MERGE

* commit '2f9f62e60197cff42d30c096ee98bb5b4b892c97':