[automerger skipped] Merge "Merge "Fix TaskFragmentTrustedModeTest" into...

[automerger skipped] Merge "Merge "Fix TaskFragmentTrustedModeTest" into tm-dev am: 1664eecb am: 9d2f3f9d" into tm-d1-dev-plus-aosp am: 8c01c2ae -s ours am: 597c7ad3 -s ours

am skip reason: Merged-In Ic58edee8e239e94b9986f06b499281487a9a973d with SHA-1 c2313021 is already in history

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



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