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: I2569ea7bafeee9a0f963e2410990eb1153044e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>