Merge "DO NOT MERGE: Add the option to skip the initial brightness ramp when the screen turns on. am: 106f1443 -s ours am: 8beca4cc am: 5792d09b -s ours"