Merge \"Merge \\\"Make lid switch edge rather than level triggered.\\\" into...
Merge \"Merge \\\"Make lid switch edge rather than level triggered.\\\" into nyc-dev am: e85da2bc am: ad0eb9d1\" into nyc-mr1-dev-plus-aosp
am: d749f4ca
Change-Id: Ice5d0aec1e09a9d8e42da5f297d65d2af7b0a86e