Merge "DO NOT MERGE Revert "Add support lib version meta-data to AndroidManifest.xml"" into nyc-support-25.1-dev