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: 0e43cc8c am: 59f8e21b

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



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