tree 24761aa4ca3f799ae4b3401dc81bcd9a6b063386
parent 02513ca37d36da5ecf01b3387457baf9a34d0119
parent 1c2c0f9edc2fddd036b49c23edb1f81f29ecd021
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245558 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1652245558 +0000

Snap for 8570526 from 1c2c0f9edc2fddd036b49c23edb1f81f29ecd021 to mainline-mediaprovider-release

Change-Id: Ibf9a64aaa36056195707c9aa85b583ac3cd4b090