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: a2b2b561" into udc-d1-dev-plus-aosp am: b6f20a80

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



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