Merge "Change file access return types to ParcelFileDescriptor" into main