Merge "Unrotate going-away apps during a launch-into-orientation transition" into sc-v2-dev am: 7a23b1517d am: 8d6e15208a

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

Change-Id: Ica83c5e30e9736ac91519cdd5a54172198a9ef46