Merge "Add GENERATED_FROM relationship for static libraries generated from the AOSP platform" into main