[automerger skipped] Merge "[VCN15] expose addUnwantedCapability and related...

[automerger skipped] Merge "[VCN15] expose addUnwantedCapability and related APIs" am: f38268cd am: b894e123 am: b9be227c -s ours am: dcca6f6f -s ours

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

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

Change-Id: I35d8b4e50b184a48af5d531708f5e3b36da271f9