Merge changes from topic "transcode-fix-s" into sc-dev am: 51f5048a0a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/15502661

Change-Id: I4a12d7334fac4ce9ae224fbe5d0c6abb8d644c8f