Merge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev
am: f32b03d124

Change-Id: Iddeebcc713bf6728bcf207965fa0f784a7df6bb7