Merge "Revert "Q Upstream: Use ParcelFileDescriptor for storing large clip data."" into rvc-dev