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

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

Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178
tree: 7d131188dea5690c78e5469f71f81dd4fd58b601
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING