Merge "Skip syncing local window for rotation with shell transition" into tm-qpr-dev am: 4f28845c

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



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