Merge "Make sure the secondary TaskFragment is above the primary" into tm-qpr-dev am: 907c1ad8

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



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