Merge "fix(magnifier): fix deadlock when feature flag changes" into udc-dev...

Merge "fix(magnifier): fix deadlock when feature flag changes" into udc-dev am: d8565cf4 am: 9d8bf543

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



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