Fix bug in screen capture and lock task migrations

Bug: 318497672
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:996050c7ce41b6bbf93010bcaa1d490fd470d07a)
Merged-In: Id0ac7d06b57f690d114217f2a34c2a1e8c60a277
Change-Id: Id0ac7d06b57f690d114217f2a34c2a1e8c60a277
4 files changed