Merge "Add version code to legacy MediaProvider manifest." into rvc-dev