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

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

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