Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev am: e07e8ac99a  -s ours am: 610663ebc5
am: fa64e10e2e  -s ours

Change-Id: If3acbdf6326f37aa78a2ec530e772959f046c514