Merge "Conditionally remove VCN jars from non-updatable platform" into main am: 08e435ddf7

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

Change-Id: Ie19c35084b0c42674fc279ffca622e9faf08318b
Signed-off-by: Automerger Merge Worker <[email protected]>