Merge changes from topic "revert-2961763-lockscreen-land-TBIGGOZYLF" into main...

Merge changes from topic "revert-2961763-lockscreen-land-TBIGGOZYLF" into main am: 333c7a0c am: c75579a9

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



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