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

Change-Id: I9cd0826ced67887cd960fb7be34f5cb5b62c109c