Merge "Fix the “screen lock option” and password restriction view are in the...

Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1c am: 17d1e709

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165



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