DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on. am: 106f1443c1  -s ours
am: 8beca4cc6f

Change-Id: I798681141b035eb3f29ab4824f2807cdb21010d9