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

Change-Id: I7d3515885e6ac94da091d53ea39bd8e381a18322