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

[automerger skipped] Merge "Fix TaskFragmentTrustedModeTest" into tm-dev am: 1664eecb am: 723b87bb am: 4c19ce7f -s ours am: 6daaf584 -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: Ia459af2524c9cdad693b09b9a02b5618917050fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>