Merge "Fixed an issue where the statusbar was made opaque even though it wasnt" into sc-dev am: 6c21f29b32

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

Change-Id: Ife03fccc04eab6a99041cef49503458ba123157a