Merge "Changed the cached threshold that decides when to defer bcasts." into...

Merge "Changed the cached threshold that decides when to defer bcasts." into udc-dev am: dea20a43 am: eac58b54

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



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