Merge "Logging tron metrics for ambient display gestures" into nyc-mr1-dev