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

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

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