[automerger skipped] Merge "Fixed an issue where the statusbar was made opaque...

[automerger skipped] Merge "Fixed an issue where the statusbar was made opaque even though it wasnt" into sc-qpr1-dev am: f1eb5cc1 -s ours am: ca1132c5 -s ours am: d29c438d -s ours

am skip reason: Merged-In I5a7e80e2ced8f15f1b215549d0c051f1d61d2953 with SHA-1 5d993ac2 is already in history

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

Change-Id: I14a9b65bb28438cfc9e959be6e5558c9c1b70837