Merge "Limit default capabilities to Android B+" into main am: 54b07a719c

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

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