Fixing couple issues DO NOT MERGE

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
diff --git a/.gitignore b/.gitignore
index 07a80d6..dbd5bcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 /bin
 .idea/*
 .idea/
+gen/
+*.iml