Merge "Fix bug that caused task to show behind keyguard" into sc-dev am: b2487187 am: 17b6650d

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

Change-Id: Ied3b7b7be704f05933ff6152c3c66fa8e43b57d5