[automerger skipped] Merge "Fix bug in screen capture and lock task...

[automerger skipped] Merge "Fix bug in screen capture and lock task migrations" into 24D1-dev am: 616f5187 -s ours

am skip reason: skipped by kholoudm

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



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