Merge "Postpone color mode change until after boot animation am: c53d3558...
Merge "Postpone color mode change until after boot animation am: c53d3558 am: 18b6b78e" into oc-mr1-dev-plus-aosp
am: 072c502c
Change-Id: I39765550b391eafc994411ca90e2ec39ff7d7cec