Merge "Add isUsageSupportedForUpstreamType() helper method" into main am: f4bae99d1d

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

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