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

Change-Id: I6383e11eeba2470bb98822bb393dab909a0c9191