Merge "Add PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES API" am: 24db27017f

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

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