Merge "Split collect logic out of requestIfNeeded methods" into main

services/core/java/com/android/server/wm/ActivityRecord.java

...ava/com/android/server/wm/ActivityTaskManagerService.java

...re/java/com/android/server/wm/ActivityTaskSupervisor.java

services/core/java/com/android/server/wm/DisplayContent.java

...ices/core/java/com/android/server/wm/DisplayRotation.java

...s/core/java/com/android/server/wm/KeyguardController.java

...id/server/wm/PhysicalDisplaySwitchTransitionLauncher.java

services/core/java/com/android/server/wm/Transition.java

...core/java/com/android/server/wm/TransitionController.java

...core/java/com/android/server/wm/WindowManagerService.java

services/core/java/com/android/server/wm/WindowToken.java

...mtests/src/com/android/server/wm/ActivityRecordTests.java

...ts/wmtests/src/com/android/server/wm/TransitionTests.java