Merge "Fix potential thread violation in applying gainmaps" into udc-qpr-dev am: 7e9773de am: d93edc76

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



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