Merge "Add package.html files to services metalava stubs" into sc-dev