Merge "Release lock before color extraction on dim changes" into udc-qpr-dev am: e3d66c3857 am: f54661bf5a

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

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