Merge "Remove the light flag if the bar isn't specified light in theme" into...

Merge "Remove the light flag if the bar isn't specified light in theme" into sc-dev am: de8ea692 am: 7a696a23 am: eff4d7d4

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

Change-Id: Id0ce0e40c701eed194f6416c98b583b0d96084bc