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

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

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