Merge "Revert^2 "Move PdfRenderer java and native code to packages/providers/MediaProvider"" into main