Merge "Merge "Add NEW_LIGHT_BAR_LOGIC flag" into udc-dev am: 9f9b600e am:...

Merge "Merge "Add NEW_LIGHT_BAR_LOGIC flag" into udc-dev am: 9f9b600e am: 093ca7ce" into udc-d1-dev-plus-aosp am: 728c1a01

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



Change-Id: I78358728cbdad44caa22043f6459d3f919da83a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>