Merge \\"Logging tron metrics for ambient display gestures\\" into nyc-mr1-dev am: acc8944582
am: 77f3612ed2

Change-Id: Ie7ec8e79d36a5074e3a55f43d7d77c7025751b4e