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

Merge "Do not deduce VCN capability if Builder is derived from request" am: 4f6c13a4 am: 22edbef1 am: 807284da

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

Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178