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

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

Change-Id: Iaa6a51a882878d06838ba6caacadd1faf2bce19b