Merge "Do not deduce VCN capability if Builder is derived from request" am: b808656439 am: d6d2cfa107

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

Change-Id: Ib6a1b690c32b25aa86d8d432ac3f3a9eb1803efa
tree: 738f7ed2e124c10e608c86c669c9fc33e61c0fed
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING