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

Merge "collect task moving-to-back" into udc-dev am: 118f70d8 am: 26914a95 am: afbae4f3 am: 144ba894

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



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