Merge "Do not deduce VCN capability if Builder is derived from request" am: 4f6c13a4c2

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

Change-Id: I19da4ae952b5d412b429aa291868e8e7980ad5fd