[automerger skipped] Merge "Add PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES...

[automerger skipped] Merge "Add PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES API" am: 24db2701 am: e1e0456d am: 47f2fcd7 -s ours

am skip reason: Merged-In I99b0698748af3cfafa0ff84df0454584dbad88b1 with SHA-1 2a1fee49 is already in history

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



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