tree 90a2bc73bd09dcc7f2d59298089f8570c4daa510
parent f40564f85ec3e549f13dd83f0a4ce6bd40453d3c
parent 29b4ae638de166772239ac60c9914c53ef351797
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245695 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245695 +0000

Snap for 8570526 from 29b4ae638de166772239ac60c9914c53ef351797 to mainline-mediaprovider-release

Change-Id: Ia267228e239688dd99e92c4bc73b2c4d46a488ae