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

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

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