[automerger skipped] Merge "Improve the net-capabilities scheme for backward...

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

am skip reason: Merged-In I56cde50d2adab81134c8be4f6996d68018f4212a with SHA-1 46c3c694 is already in history

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

Change-Id: Ic785f33b092954fb06aab97d95f7c418fb0ee65e