Merge "Fix entitlement recheck fail in U" am: 65a73dbf78 am: 3f0db9d4cb

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

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