tree d833386e6b2d2e4611aa12f4295ec38655b6c899
parent 7a73a1f8e9fd691cb8f45aa9de303f3c39c3837a
parent 4394cdf90094161d5caf4f7237c883ab2862c2f2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245343 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245343 +0000

Snap for 8570526 from 4394cdf90094161d5caf4f7237c883ab2862c2f2 to mainline-mediaprovider-release

Change-Id: I24f6bb70c4125bcf1f62d1f8c5f455dd9c4c96dd