tree f44672b3268bf2c3b001cea1ab4113accc236bb3
parent c1208c32e9840152c5312ca33199f48857cffc97
parent ecfeee7607781bcdd1139abf162a83c3d2d50c06
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245842 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245842 +0000

Snap for 8570526 from ecfeee7607781bcdd1139abf162a83c3d2d50c06 to mainline-mediaprovider-release

Change-Id: I5be5ff2f12d1eefead84351d521cf27039467b1d