tree 4ee58bf9959c672216658480d3879e60c960cb8b
parent 5a6ad3f896023714fb08b40ce87db1dc8a81a0b0
parent b0b206c56a94ab2a374c360f6bd36d8f0fa696d4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1655673541 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1655673541 +0000

Snap for 8743843 from b0b206c56a94ab2a374c360f6bd36d8f0fa696d4 to mainline-mediaprovider-release

Change-Id: Ia18ad6c1dd9292cf87dd83a048aa15dc5849daf2