Merge "Fix TaskFragmentTrustedModeTest" into tm-dev am: 1664eecb70

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

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