tree 3f919cad52621300a76ea5dff00ef81670e6034f
parent 0ac53167788ee8c7d18e2ab014636e8d8a676fcd
parent 327c58ba644d5c05e2b4c18d481bc98660227a02
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245403 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245403 +0000

Snap for 8570526 from 327c58ba644d5c05e2b4c18d481bc98660227a02 to mainline-mediaprovider-release

Change-Id: I5a51e0ead3df38c5988e40dd1b6e3318b14d1475