Merge "Revert "Avoid calling updateSurface twice when dimming is applied.""...

Merge "Revert "Avoid calling updateSurface twice when dimming is applied."" into tm-dev am: 05aa7824 am: fb6accb1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231745



Change-Id: I1afbf33d225a8d75f1f03df58d306c77f2029346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>