[automerger skipped] Merge "Use normal rotation if orientation is changed by resume-scheduled app" into rvc-qpr-dev am: 75a288bf07 am: 993a49edf4 -s ours

am skip reason: Change-Id I3253264cb1bb8886074e88012582daa3589a1896 with SHA-1 4d576bfa25 is in history

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

Change-Id: I5943a109bcfbbf2e0ca650ff04b5026aea79b983