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

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



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