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

Change-Id: Ib887ac9a44e6d5a1a3ac8ebce494643ef0840cab