[automerger skipped] Merge "Improve the net-capabilities scheme for backward compatibility" into sc-dev am: 89c463ba am: a63fda90 -s ours

am skip reason: Merged-In I56cde50d2adab81134c8be4f6996d68018f4212a with SHA-1 2fcda2f9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15013191

Change-Id: I1a4405530bdfe2b70b779f5d96b0b5b55f45bf8b