[automerger skipped] Merge "Fix entitlement recheck fail in U" into udc-dev am: 9427b0e3a5 -s ours

am skip reason: Merged-In Ife30eee13fe39509ccb5786d2a76fbb7baa022a8 with SHA-1 e86fb5ef56 is already in history

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

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