Merge "Decrease the inferred auto-brightness adjustment at the extremes." into pi-dev
am: b718563329

Change-Id: I76e456b7f000cedb183115f0abd306957e983ffa