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

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>