Merge "Promote NEW_LIGHT_BAR_LOGIC flag to teamfood" into udc-dev am:...

Merge "Promote NEW_LIGHT_BAR_LOGIC flag to teamfood" into udc-dev am: 0d1dd642 am: 7fed9e83 am: 6e7322ce am: 36460d1d

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



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