[automerger skipped] Merge "Fix TaskFragmentTrustedModeTest" into tm-dev am: 1664eecb70 am: 9d2f3f9d1f -s ours

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

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

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