Merge "Revert "Changed the ambient display setting name"" into oc-dev am: 97d3709b25
am: 1b322f6283

Change-Id: Ia33ee063b87d2cc6951d6a85a88b45b14c67b229