DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable am: 61038ddb61  -s ours
am: 1353c06d83  -s ours

Change-Id: I95ee4044d8d303a1cecb2a5a1e46ca371db86f3d