tree 42f3e36df36464bdd7d7fcba2e800e7997ef11e6
parent bfd03d4d5761e85233613ef9095ffdd827ec20fe
parent a4a1a2293e7a4aacf1d3157aeba89c703cb7da02
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 a4a1a2293e7a4aacf1d3157aeba89c703cb7da02 to mainline-mediaprovider-release

Change-Id: Ic6e01029be2fbd97765a22e3517ff41f031edf3b