[automerger skipped] Merge "Correct predictive condition about companion...

[automerger skipped] Merge "Correct predictive condition about companion TaskFragment." into 24D1-dev am: d56dad71 -s ours

am skip reason: Merged-In I1dfb9ed8b27a520db0a240e2645910656d1894df with SHA-1 e4bc72c1 is already in history

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



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