Revert "Use same display for activities in same process."

Revert "Update multi display for new launch mode."

Revert submission 12141146-Same activity in display

Reason for revert: Seems there was a merge error breaking master.
Reverted Changes:
Ic3e5e90ae:Update multi display for new launch mode.
I8344f239e:Use same display for activities in same process.
I697d63ed2:Update car launch params modifier.

Change-Id: I248a4dd160b9af64e9761494892927b42083233e