Merge "Do not deduce VCN capability if Builder is derived from request" am: ed05115dca am: b91719b526 am: 662285d428

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

Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178
tree: 4e510e7f52c33409f386c22c5c628e6543f2658e
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING