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

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

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