Merge "AOD: Prewarm display while waiting for brightness sensor" into oc-mr1-dev am: 1952fcffc3
am: b4fe0c9fa5

Change-Id: I876c2d0afee23254b129a8694b3021085d35701d