Merge "Add support lib version meta-data to AndroidManifest.xml" into nyc-support-25.1-dev
am: 702732a450

Change-Id: I24ef6ab3d4380df58631a8f04981ea158258bc82