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

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



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