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

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



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