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 am: 7ca991f8

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

Change-Id: I54aadb2d1b4e8ba9549aaa61c88e160b3a0ba88d