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

Change-Id: Icf7151ec75a8eabf2fe04f2dde6fba7090cf8d06