Merge "Merge "Use top activity for fixed rotation from snapshot starting...

Merge "Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev am: d6ad543b am: ff3c85f5" into tm-d1-dev-plus-aosp am: ef1f6a51

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



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