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

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

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