Merge "Add some timeout for waiting proxy being updated" am: 8c0cefc928

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2628997

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