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

Change-Id: I69bf2f73c3a881c4586aa1c03eee935ae10fb7f2