Merge "Merge "Fix unlock failure when app is in reverse portrait orientation."...

Merge "Merge "Fix unlock failure when app is in reverse portrait orientation." into sc-v2-dev am: b9ee2b5e" into sc-v2-dev-plus-aosp am: fb6f576b

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

Change-Id: I1ce9b8781a45587a5f79b7aadefa908e150cd48a