Merge "Rename Automatic color to Adaptive color" into pi-dev
am: f32310a7e6

Change-Id: I58c8322796905bc7ed589c3153c9de65598f268f