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

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

Change-Id: Ie88ff422c473d3891a054fa75b5175b30c10cec9
tree: 17307535359b8fe9c647fc09391759661ec3fe59
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING