tree fced7922414aa2c66a73af722daa5d4c2f04c0b4
parent b8cc4c24e14e8333d9d8724bab220ba5289fdfbd
parent 00d4c39486f5b6c133e5f8ec99af7e007c4e3ed0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245860 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245860 +0000

Snap for 8570526 from 00d4c39486f5b6c133e5f8ec99af7e007c4e3ed0 to mainline-mediaprovider-release

Change-Id: If83058ee128ae33f21057b3c838d7d8534d55599