Merge "Use elevation on edit contact layout to match people list content shadows" into lmp-mr1-dev