Merge "Implement timeout mechanism to wait for network connectivity." am: f4df08e1

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



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