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

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

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