Merge "Add more package names for MediaProvider"