Merge "Fix deadlock between DPMS and AMS" into udc-qpr-dev am: 0a40bc7e77

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

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