[automerger skipped] Merge "[VCN15] expose addUnwantedCapability and related APIs" am: 84ebe6693a am: 767a374b4b am: d74b82c473 -s ours

am skip reason: skip tag Change-Id I3f2e6a99e015f09cc4405f6804eac4ae33e3dcc7 with SHA-1 e76b5f7004 is already in history

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

Change-Id: Id34011ffbdd997f29140b12cae5a0caeae745d3e
tree: b72944f743663f15b37324bf1ca9fb2d7703acf0
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING