Merge "Add feature flag for revamped bouncer messages" into udc-dev am: 61b1900d

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



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