Merge "Fix LockTaskTest." into sc-dev am: be359b4435

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15326348

Change-Id: I6cd933a4ad3f2e0cd134449494edfd95aff21e0b