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

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

Change-Id: I712e3cb647b1ac34fbb9bbec7203a6ec7fa052c4