Adding caller display id when launching activities via PendingIntent

Activities were launched on primary display when they were started
via PendingIntent, because we didn’t have the caller information
from PendingIntent and were unable to determine the preferred
displays for the newly created activities.

Applications should use the correct context while calling
PendingIntent.send().

Also fix that animation type could be overrides when merging
two activity options.

Bug: 130967908
Test: atest MultiDisplayActivityLaunchTests

Change-Id: I9c50900937f20a83768d5e676b93c4c02665f8cb