tree 8c986e32937c71d62844fdcc8157acc6c3377538
parent 1f2af63620fd6f69516f7c680ada2eb3c1964640
parent 6e40b7e34d1928769c34293fc97976a67bf9f17d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245385 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245385 +0000

Snap for 8570526 from 6e40b7e34d1928769c34293fc97976a67bf9f17d to mainline-mediaprovider-release

Change-Id: Ia89a1cf4178e37f93479e2d39c8f81ee4d410e85