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

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

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