tree 0fe5012e262a64b731e9ad784daacb6ba3c72761
parent 5611a571146fbc5dc6c900e96dc16f0b1d0a8bb9
parent e39516d84d785435a1b61f81234143df10d69a5c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1650230502 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1650230502 +0000

Snap for 8465414 from e39516d84d785435a1b61f81234143df10d69a5c to mainline-mediaprovider-release

Change-Id: Ie6d6d38bee063dd7ffe07d227b890fec3eee4d22