Merge "Make sure surface crop is up-to-date when moving to front" into...

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

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



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