[automerger skipped] Merge "Fix TaskFragmentTrustedModeTest" into tm-dev am:...

[automerger skipped] Merge "Fix TaskFragmentTrustedModeTest" into tm-dev am: 1664eecb am: 9d2f3f9d -s ours am: aa96d79c -s ours am: 7a19e265 -s ours

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

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



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