Base: Floating window <> MultiWindow

use this patch if you want to merger Floating window and multiwindow

Change-Id: Ia30ea5beb1993908bd58d785f4174b3b93a3961a

Conflicts:
	services/java/com/android/server/am/ActivityStack.java