[automerger skipped] Merge "[DO NOT MERGE] Keyguard PIN View - Landscape...

[automerger skipped] Merge "[DO NOT MERGE] Keyguard PIN View - Landscape fixes" into sc-v2-dev am: 98f21387 am: 43026dfe -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8a7f9d31f32ad007714ffd02dbf159d0bc02154b