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

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

Change-Id: I2399d227492d896869016ae63b8f942ccc858832