Merge changes from topic "mm_remove_floating_tasks" into tm-qpr-dev am: 33a70394 am: cd622f17

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



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