Merge "Fix issues where the task was still touchable in overview" into...

Merge "Fix issues where the task was still touchable in overview" into sc-v2-dev am: a7fedd96 am: 747e9457

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

Change-Id: I17fa4496238ac79d12a46f4661a38afa1ccabe88