[automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 -s ours am: 8e6e5177a6 -s ours
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 f8e2e20f32 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235
Change-Id: I0aa42e1b65155195a56b85af56a35053bd4b89e5
This commit is contained in: