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

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

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