Merge "Deprecate Vendor Overlay when VNDK is deprecated" into main