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 am: 32c02eda

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



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