[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-dev am: 6c21f29b -s ours am: 43ed3cf4 -s ours

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

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

Change-Id: Icbecfe7aafb4bf6d8073dd3ddaf9a5d95cc091b9