Merge "Enable DELAY_BOUNCER For Droidfood" into udc-qpr-dev am: 391ca5800b am: 2a10a679f7

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

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