[automerger skipped] Merge "Fix deadlock between DPMS and AMS" into...

[automerger skipped] Merge "Fix deadlock between DPMS and AMS" into udc-qpr-dev am: 0a40bc7e am: c9d1b984 -s ours

am skip reason: Merged-In I0aa2e397ac49d90b5f89ba10e11cab665cc2e915 with SHA-1 058ebf6e is already in history

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



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