Merge "PTP: Add android.provider.Ptp to the public API"