Merge "Make com.android.location.provider visible to apps-only build."