DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am: 13edf0a70b  -s ours am: 0903c5fe7a  -s ours
am: f51dfc24d1  -s ours

Change-Id: I1afeaa3f5321c536cad22455881b36582b468748