Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev

packages/SystemUI/res/layout/super_status_bar.xml

...es/SystemUI/src/com/android/systemui/SystemUIFactory.java

...UI/src/com/android/systemui/bubbles/BubbleController.java

...UI/src/com/android/systemui/statusbar/phone/LockIcon.java

...com/android/systemui/statusbar/phone/ScrimController.java

.../src/com/android/systemui/statusbar/phone/ScrimState.java

...I/src/com/android/systemui/statusbar/phone/StatusBar.java

...d/systemui/statusbar/phone/StatusBarWindowController.java

...android/systemui/statusbar/phone/ScrimControllerTest.java