Move back display ID for ActivityOptions.

ActivityStackSupervisor#getLaunchStack() is used in ActivityStarter,
ActivityStackSupervisor#findTaskToMoveToFront() and
ActivityStackSupervisor#anyTaskForIdLocked(). Only ActivityStarter has
LaunchParams so we still need to take the display ID from
ActivityOptions to avoid further regressions in other cases.

Bug: 119794136
Test: Manual test. go/wm-smoke.
Change-Id: Ia18bf19cf3648fc416364d78ef4b0b37c576cef4