tree ec238f93fddef597a5a6086b7c363bae33958735
parent 4b6de5426bdeed1c7b63ef0ded3e955adf6206d7
parent 22907f4d05369353acca7789e0e4610a2d6ccacd
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245458 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245458 +0000

Snap for 8570526 from 22907f4d05369353acca7789e0e4610a2d6ccacd to mainline-mediaprovider-release

Change-Id: I7d06527408f1e76d7981f8c3441c933d4834c07a