Merge "Add PROPERTY_SELF_CERTIFIED_NETWORK_CAPABILITIES API" am: 24db27017f am: e1e0456d12

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

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