Merge "Enable plug-in statusbar chip for dogfood" into udc-dev am: eef20016

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



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