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

Change-Id: I723a9d1d04cfb696e325427030f0fff13394345d