tree 7fe83959c592e8f5ad66e632a2e74f03719b899b
parent c9fa63615ec7193d11cad66666b908ab9a121c4d
parent 22216534944c6f96a2c997ddbab70d16379e6f42
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245614 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245614 +0000

Snap for 8570526 from 22216534944c6f96a2c997ddbab70d16379e6f42 to mainline-mediaprovider-release

Change-Id: Id282c258c9f0035147f5531c5dbfa095aad48b48