Merge "Allow rotations to portrait on unlocking when unfolded" into tm-qpr-dev...

Merge "Allow rotations to portrait on unlocking when unfolded" into tm-qpr-dev am: b8c2e307 am: ae8937f6

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



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