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

Change-Id: I9a2addc832f82e52940711986da25cc16b06ac31