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

Change-Id: I8541342d3466e4e1d686b3faa890830edadba940