tree c298bd61343d7396799ae4a9926ec7f6d58001d0
parent a36ad2943e16d4d014b104a3721d43810f11d080
parent afff79c8641d51e53e49f564ce79993b474b6c8c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245339 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245339 +0000

Snap for 8570526 from afff79c8641d51e53e49f564ce79993b474b6c8c to mainline-mediaprovider-release

Change-Id: I03fe9b1d683848b4a2f15ad709820d01b8b8162a