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: 12ea329d

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

Change-Id: I54ca1686b0fde7526b4864061d1f8b6ba2d5a0bd