Merge "Fix AE LockTaskMode issue on fold devices" into main am: 808e7212e3 am: 2863dc9801

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

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