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

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

Change-Id: I50f6ad8d8c1b0145fcdac7b977c3146d94a80442