Merge "Should update surface position of the window before report resize" into...

Merge "Should update surface position of the window before report resize" into main am: cac166a1 am: 2d519acd

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



Change-Id: Iaa3e2500ed75e2076c741adc0b10e9625f5a03c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>