tree 5561ca57639650f9893e926183c235676ced22c8
parent 6aee581175b49ae31c60c358f498df5625e255eb
parent 094cd640f7f302cae481bfdfb76ddc2d89d7ca86
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245393 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245393 +0000

Snap for 8570526 from 094cd640f7f302cae481bfdfb76ddc2d89d7ca86 to mainline-mediaprovider-release

Change-Id: I2500dee8cd89c61ec78a1f58ff77a90b286f437a