Merge "Disable multiwindow support for watch devices by default." into cw-f-dev
am: 0d3f740316

Change-Id: I7867b0ff72237c7ce216f570034f6f811e5a6abb