Android mainline 12.0.0 release 11
Snap for 7734431 from 10bea512a7ca7cca7f4f334e69b03cc11870f2af to mainline-mediaprovider-release

Change-Id: I7a53a111566258507c3c8e09c073095248d1d17c