tree a2cb297b6ce6a58a9595bfd7f63fa23626a87a9c
parent 25d0ee94cc40fe287f39153a3276cd178df09c2b
parent 0a40bc7e77bdb38c7fd68cf00f74a60c5c4a3c69
author Ayush Sharma <ayushsha@google.com> 1694001385 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694001385 +0000

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>