Merge "Avoid collect window token which should be rotate independently" into...

Merge "Avoid collect window token which should be rotate independently" into tm-qpr-dev am: 24737bd8 am: 6d72029b

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



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