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

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



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