[automerger skipped] Merge "DO NOT MERGE: Delay brightness change" into pi-dev am: 0937d1807b
am: 5d8e53ce88  -s ours

Change-Id: Ia11b6124a38c2f8cebd97a36f5f3c0e0f72da404