Merge "Reduce timeout to 3 seconds for provider response" into udc-dev am:...

Merge "Reduce timeout to 3 seconds for provider response" into udc-dev am: 9d69f5af am: 2a69f766

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



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