Merge "Bundle Metalava based api-versions.xml to SDK" into stage-aosp-master