[automerger skipped] Merge "Extend the BIND_APPLICATION_TIMEOUT" into...

[automerger skipped] Merge "Extend the BIND_APPLICATION_TIMEOUT" into udc-qpr-dev am: 70842392 am: 07035f59 -s ours

am skip reason: Merged-In I442e997fa6f30445ddeb2922146e837cc24d4174 with SHA-1 f58fe599 is already in history

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



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