Merge "Rehide the PTP content provider interface from the public API."