Merge "Reland: Dispatch TaskOrg events before finishing surface placement" into sc-dev am: e114b8f4 am: f09bce47

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13582944

Change-Id: If1a9532421ddf875d23864562cf81e48b52a2d3c