Merge "AOD: Delay removing AOD scrim after pulse" into oc-mr1-dev am: 36d3f3fd02
am: db7d85c8e7

Change-Id: Id48c8b64601fa20a2076230c24af68e4b27446ec