Merge "Fix extra configuration change when unlocking directly" into rvc-dev

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

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

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

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

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

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

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

...wmtests/src/com/android/server/wm/ActivityStackTests.java

...om/android/server/wm/ActivityTaskManagerServiceTests.java

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

...src/com/android/server/wm/RootActivityContainerTests.java

...sts/src/com/android/server/wm/SystemServiceTestsBase.java