tree 28c1d5a3e90a16a7f5377dff7b7e627daa32d389
parent a20471031e4694bfa083482d0465f9e28c93e454
parent ae3315be4a1907aa56366e42538f37256c7eaaa2
author android-build-team Robot <android-build-team-robot@google.com> 1610581560 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1610581560 +0000

Snap for 7080740 from ae3315be4a1907aa56366e42538f37256c7eaaa2 to mainline-mediaprovider-release

Change-Id: Ibb78215bf8b28c3e175f66d17d23f7e4ea949be9