Merge "Do not change surface of system window token for transition" into tm-qpr-dev am: 8af9006e

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



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