Merge "Fix TaskFragmentTrustedModeTest" into stage-aosp-tm-ts-dev