Revert "Revert "Update Floating Window with latest AOSPA commits""

This reverts commit d60fd323b199f4c329c9823272ab63d2a44ca0e9.