[automerger skipped] Finish fixed rotation after recents moved to top am:...

[automerger skipped] Finish fixed rotation after recents moved to top am: 5a5734bb am: f4ee939a -s ours

am skip reason: Change-Id I5c5c12338b9bc0cd8a99655a843a33d8729f8892 with SHA-1 6f9a0bf0 is in history

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

Change-Id: Id4031fd6c6e48e55690a68a0d3ee0c9ca16e8d98