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

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

Change-Id: I14aac4a1933cb0495713aba945d5dac592ab55cd