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

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



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