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

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

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