Merge "Remove assert for R+" into main am: 9f71aa3e4d am: 02ff89877f

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

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