Merge "Add Wear keycodes to emulator key layout file. am: 119a06ce55 am: c85e503d52" into nyc-mr2-dev-plus-aosp
am: da5289b6ed

Change-Id: I34d2a4a3945579820af1c3fdb04da53b956bf665