Merge "DO NOT MERGE Revert "Add support lib version meta-data to AndroidManifest.xml"" into nyc-support-25.1-dev am: 8a39c793b6  -s ours
am: 37de8a4f3d  -s ours

Change-Id: I7440deeb99efb76d65698c2b6162336456c5cf84