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

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



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