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