Merge "Move android.media.Image* from media to core" into main