Android Mainline 12.0.0 Release 121 (8641177,com.google.android.mediaprovider)
Snap for 7468467 from 9e2a0cb90035e3453e43c9a9ea9499a439e9261d to mainline-mediaprovider-release

Change-Id: Ib4b08148ca87a370c391e81074dfd66f80565e2c