Don't force FREEFORM on FULLSCREEN displays.

Was previously forcing FREEFORM on FREEFORM displays even if
ActivityOptions specifically requested another mode

Bug: 124409167
Test: atest TaskLaunchParamsModifierTests

Change-Id: I1229725dffd24a536802d71106c0c06797b95ef1
2 files changed