tree b10ca6a2a49781012e5097ba8218dc8da64e7e4a
parent 7e2af8279102229c3b577f07a1368a5ab6779650
parent 6941c510fb7269594234c167d4da294171bc5672
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1627585565 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1627585565 +0000

Snap for 7595129 from 6941c510fb7269594234c167d4da294171bc5672 to mainline-mediaprovider-release

Change-Id: Iab84bb91e933c6aa02a2ed0e51959e67f4862ee4