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

Change-Id: Ib3610c0c93e5c55f8d826c5f8cb60e1deb43d29e