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

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

Change-Id: I184aaff79329f27ba7dec7e87642a0653dbcad93