Merge "Promote NEW_LIGHT_BAR_LOGIC flag to teamfood" into udc-dev am: 0d1dd642 am: e02018d1

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



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