tree aff7201efc0b0e8e38b46b8c93104b9639bed7cf
parent dbf4042b3bea8f4570591a5302ca2f2d3408cf4b
parent 612ce531b7d6d7a349467acfedd2b399787372f1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245878 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245878 +0000

Snap for 8570526 from 612ce531b7d6d7a349467acfedd2b399787372f1 to mainline-mediaprovider-release

Change-Id: I2740d141e6329db4261f93d69c446ad64229afca