Merge "Increase max delay for Admin UID propogation" am: 07cadf26fa am: 5777f84690 am: 3de500e917 am: b5851540df am: d6b37540ea

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

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