Merge "Use normal rotation if orientation is changed by resume-scheduled app" into rvc-qpr-dev am: 75a288bf07

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

Change-Id: I90985605c563686b09b332f5928a18f0b3d67699