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

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

Change-Id: I95fd4fb11b9d7ebfc0180bdeea30c8497b203c89