am 8f6d2901: (-s ours) am b14bba7e: am ba893966: Disable screen pinning test on watches and tvs. DO NOT MERGE * commit '8f6d2901': Disable screen pinning test on watches and tvs. DO NOT MERGE