Merge "collect task moving-to-back" into udc-dev am: 118f70d8 am: 6688613b...

Merge "collect task moving-to-back" into udc-dev am: 118f70d8 am: 6688613b am: 97e541cd am: cce8a431

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



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