tree a45292e207890fd4cc767477ee5f9a3002c56c91
parent b5031a391d54f31ade427ad29bba21137aedd27b
parent 14ee28c3f0213a65c0ac28f2b27e58ef6822d25c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1650230446 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1650230446 +0000

Snap for 8465414 from 14ee28c3f0213a65c0ac28f2b27e58ef6822d25c to mainline-mediaprovider-release

Change-Id: I9c48bff51f6a5aee44879809ceadc1b7bd17af61