Fixing couple issues

1. Split the layout into two, for watch-specific and everything else.
2. Disable proximity sensor test for watch.

Bug:31672333,31223299
Change-Id: Iad40cfff31510328165a145b3731d9e3839da561
(cherry picked from commit e63db3ba06062b65b6b97737737e5be3114cf265)
6 files changed