Android Mainline 12.0.0 Release 31 (8012789,com.google.android.mediaprovider)
Snap for 7734431 from 894fca7cca36d24c18adb418b22bbe7ef2e65a5e to mainline-mediaprovider-release

Change-Id: I34a729c0f0958313f01a607810c42ad2d6ddc88f