Android mainline 12.0.0 release 11
Snap for 7468467 from fb58be9d9dc007f389c860109b6450c985b2eb5d to mainline-mediaprovider-release

Change-Id: Iac7187fe633ae68ffcb2559a125f6537c6f1e947