Merge \\"Change gesture settings for Ambient Display from nudge to double tap.\\" into nyc-mr1-dev am: 8ba6e6a792
am: 67d4b38cc1

Change-Id: I7e7a0833e8cf9dfc5c2727c65a57d29e48d3974c