tree d026d216bb5dd8d6673a7ad3fdc0c69058cf81ab
parent 1dd7f22775add3518c55f375bd674280a0238927
parent 45fc577ba2dc010112396304a26b64a73dd0696f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245584 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245584 +0000

Snap for 8570526 from 45fc577ba2dc010112396304a26b64a73dd0696f to mainline-mediaprovider-release

Change-Id: Ib7d6dcde50bda803602470f3c0bc42a9e7c07f6d