Add #connectWithTimeout (1/n) am: 67c91c405c am: 4fba545a90

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

Change-Id: Ib1d6e7967c63e1e3af632d1ca1760cba705f4a09