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