Fix bug in screen capture and lock task migrations am: 9d809f92e8 am: 590a9e4bec

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

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