Merge "[VCN15] expose addUnwantedCapability and related APIs" am: 20d187254b am: 4a074bc753

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

Change-Id: I6aee50f7f201361ae29e6442a0d28b79c6dfc1e2
tree: 81891ab93771be397246b9e9140649ac9cd24b43
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING