Merge "Implement timeout mechanism to wait for network connectivity." am: f4df08e197 am: 30e24cd0e6

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

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