Merge "Introduce bouncer delay behind flag" into udc-dev am: 9e358f75

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



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