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

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



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