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

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



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