Merge "Create VCN subdirectories and add relevant owners" am: ccd316924d am: 5a90f6bde8

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

Change-Id: I33b4a730c2d017ddf7cc8ebd6a678fb00e953ef2