Merge "Fix bug where QS tiles appeared behind keyguard" into sc-dev am: aae88541

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

Change-Id: I657b94c7e652a493ea1826d9c5a9e911124883de