Merge "drop support for V gsi on pixel 5 R base kernel" am: 818d4480e8 am: ef010d5b74

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

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