tree 8e8f18d6d9fa0cd29fa5f48f8a62dca36be1c549
parent ac9ecb840946316297c77075c72c90705424d755
parent 68d2a281186f12904cba7138f4830906827ed340
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245838 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245838 +0000

Snap for 8570526 from 68d2a281186f12904cba7138f4830906827ed340 to mainline-mediaprovider-release

Change-Id: I404e0d6d92f52f3ea90e0c275bf7f61095649ed6