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: e085ae55

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

Change-Id: Id09301b267ca692db1f0c7ff9ee17c48346d09d5