[automerger skipped] Merge "[DO NOT MERGE] Fix AoD front scrim being opaque at DOZE_PULSING" into qt-qpr1-dev am: 3bc45ce2ab am: 3c0cd40a23 -s ours
am skip reason: subject contains skip directive

Change-Id: If88ca18397e936bbdd75235d4c68e62ef1261da2