[automerger skipped] Merge "Apply TaskFragmentOrganizer changes in one WCT...

[automerger skipped] Merge "Apply TaskFragmentOrganizer changes in one WCT (2/2)" into tm-qpr-dev am: f2155427 am: ba5540ee -s ours

am skip reason: Merged-In I943d6232ff226ed6f67367fa9b7f73e1f861de64 with SHA-1 87cc485c is already in history

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



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