Merge "Reduce timeout to 3 seconds for provider response" into udc-dev am: 9d69f5af

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



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