Merge "Apply new keyguard orientation when it becomes non-rotatable" into...

Merge "Apply new keyguard orientation when it becomes non-rotatable" into tm-dev am: aa6d8151 am: f8fa159c

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

Change-Id: Id9ef5e2a6571614b057279d521431a0dbcb2d04b