Merge "Avoid calling updateSurface twice when dimming is applied." into tm-dev...

Merge "Avoid calling updateSurface twice when dimming is applied." into tm-dev am: bc99f623 am: fa9f19cf

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



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