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

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

Change-Id: Ib6a1b690c32b25aa86d8d432ac3f3a9eb1803efa