Merge "Make sure surface crop is up-to-date when moving to front" into tm-qpr-dev am: 1bbb6923

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



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