tree 98ab2cab2a7eedee6d202723e691c69c641924f7
parent c6950dfcad37409c60ed1003a0ec0de25a70f366
parent 005ce65d018aaa43641580e1316a09f255d9118f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1653005878 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1653005878 +0000

Snap for 8618784 from 005ce65d018aaa43641580e1316a09f255d9118f to mainline-mediaprovider-release

Change-Id: I3a40d0e6466ae3acd314b962ec060ecb54e999bc