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

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

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