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

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

Change-Id: I424df9d206dad1dd37a046483a20c6ea2a212809