Merge "Apply TaskFragmentOrganizer changes in one WCT (2/2)" into tm-qpr-dev am: f215542792

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

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