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

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

Change-Id: I20d5948fa5769e5bffe8500af5d674226078e25f