Merge "[VCN15] expose addUnwantedCapability and related APIs" am: f38268cd56

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

Change-Id: Ie88ff422c473d3891a054fa75b5175b30c10cec9