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

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

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