Merge "Remove MODULE_LICENSE_APACHE2 from MediaProvider" am: f04920cf99

Change-Id: I1c93b79026c527984a1bec1506797703eb5e674d