Merge "Stop throwing when the invalid capability is passed" into main am: b1d3a85f19 am: 8dc99e1c22

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

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