Merge "Update the test mapping to remove the classes which moved to mediaprovider mainline module." into main