tree 5a3ee46bd9c3e8df33cf1197939818130751178a
parent b4c85e1a929b2d01f48624ad047d82945c2939ce
parent f6905f1cf9ca4f0d8b481a27daf1969cc56f29b5
author Robin Lee <rgl@google.com> 1695914149 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695914149 +0000

Merge "Run TaskDisplayArea recovery during sleep tokens" into udc-qpr-dev am: f6905f1cf9

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

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