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: ea86ad1f am: 220c9fdc

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



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